Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 16 Apr 2012 06:40:21 +0000 (23:40 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 16 Apr 2012 06:40:21 +0000 (23:40 -0700)
commitfccdc8e9846b596362c9b0743682a9d9a4c68fec
treebf869201599045782c9f3053b886c06e6a185792
parent95ea21c1a442bc295e4ec88c2e9b94e3cabbd704
parent9517b78ea5d36158be22557f40ca03a37194f145
Merge from trunk.
etc/NEWS
src/ChangeLog